From 65f34f29306d973fe119e1de5cd4c53d7c47c97d Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sat, 23 Mar 2024 17:03:07 -0500 Subject: [PATCH] Fix so all tests pass when the template is instantiated --- .../TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak | 2 +- .../TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak | 8 +++----- .../TEMPLATE/tests/views/test_TEMPLATE.py.mak | 9 +++++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak index eb4884a..15264f4 100644 --- a/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak +++ b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak @@ -37,7 +37,7 @@ BOOLEAN_SETTINGS = [] def validate_example_on_off_ask(errors, settings): '''Make sure the values are those allowed ''' - value = settings.get('literal_column_headings') + value = settings.get('example_on_off_ask') if value is None: return if value not in ('on', 'off', 'ask'): diff --git a/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak b/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak index e7da2d6..330cc35 100644 --- a/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak +++ b/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak @@ -51,7 +51,7 @@ def test_establish_settings_default(): new_settings = config.get_settings() assert (new_settings['pgwui']['${component.lower()}']['menu_label'] - == ${component.lower()}.DEFAULT_UPLOAD_MENU_LABEL) + == ${component.lower()}.DEFAULT_${short_name.upper()}_MENU_LABEL) @pytest.mark.unittest @@ -81,10 +81,8 @@ mock_establish_settings = testing.make_mock_fixture( # includeme() -mock_add_route = testing.late_instance_mock_fixture( - pyramid.testing.testConfig, 'add_route') -mock_scan = testing.late_instance_mock_fixture( - pyramid.testing.testConfig, 'scan') +mock_add_route = testing.late_instance_mock_fixture('add_route') +mock_scan = testing.late_instance_mock_fixture('scan') @pytest.mark.unittest diff --git a/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak b/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak index e786bc3..ea99f12 100644 --- a/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak +++ b/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak @@ -40,6 +40,10 @@ pytest_plugins = ("pgwui",) # Constants +DEFAULT_URLS = {'${component.lower()}': '/${short_name}', + 'pgwui_logout': '/logout', + 'home_page': '/'} + CHANGED_RESPONSE = { 'db': 'somedb', 'db_changed': True, @@ -78,14 +82,15 @@ def isolate_upload_view(monkeypatch, pyramid_request_config): def upload_engine(*args): return MockUploadEngine(response) - monkeypatch.setattr(${short_name}, 'UploadEngine', upload_engine) + monkeypatch.setattr( + ${short_name}.pgwui_core.core, 'UploadEngine', upload_engine) settings = pyramid_request_config.get_settings() settings['pgwui'] = settings.get('pgwui', dict()) # settings['pgwui'].update({'home_page': HOME_PAGE_SETTINGS}) pgwui_common_includeme(pyramid_request_config) ${component.lower()}_includeme(pyramid_request_config) - # settings['pgwui'].update({'urls': DEFAULT_URLS}) + settings['pgwui'].update({'urls': DEFAULT_URLS}) pyramid_request_config.add_settings(settings) return run -- 2.34.1